st-entry: Add primary-icon and secondary-icon read-write properties

Instead of simply providing a setter, we now provide real properties.

https://bugzilla.gnome.org/show_bug.cgi?id=783484

diff --git a/src/st/st-entry.c b/src/st/st-entry.c
index 0fa9287679ad568e060e0c2cecdc47eaf8ac9a98..ce149191969741901f53d8395f4f5ab6a2d8dc6b 100644 (file)
--- a/src/st/st-entry.c
+++ b/src/st/st-entry.c
@@ -72,6 +72,8 @@ enum
   PROP_0,
 
   PROP_CLUTTER_TEXT,
+  PROP_PRIMARY_ICON,
+  PROP_SECONDARY_ICON,
   PROP_HINT_TEXT,
   PROP_TEXT,
   PROP_INPUT_PURPOSE,
@@ -122,6 +124,14 @@ st_entry_set_property (GObject      *gobject,
 
   switch (prop_id)
     {
+    case PROP_PRIMARY_ICON:
+      st_entry_set_primary_icon (entry, g_value_get_object (value));
+      break;
+
+    case PROP_SECONDARY_ICON:
+      st_entry_set_secondary_icon (entry, g_value_get_object (value));
+      break;
+
     case PROP_HINT_TEXT:
       st_entry_set_hint_text (entry, g_value_get_string (value));
       break;
@@ -158,6 +168,14 @@ st_entry_get_property (GObject    *gobject,
       g_value_set_object (value, priv->entry);
       break;
 
+    case PROP_PRIMARY_ICON:
+      g_value_set_object (value, priv->primary_icon);
+      break;
+
+    case PROP_SECONDARY_ICON:
+      g_value_set_object (value, priv->secondary_icon);
+      break;
+
     case PROP_HINT_TEXT:
       g_value_set_string (value, priv->hint);
       break;
@@ -794,6 +812,20 @@ st_entry_class_init (StEntryClass *klass)
                               G_PARAM_READABLE);
   g_object_class_install_property (gobject_class, PROP_CLUTTER_TEXT, pspec);
 
+  pspec = g_param_spec_object ("primary-icon",
+                              "Primary Icon",
+                              "Primary Icon actor",
+                              CLUTTER_TYPE_ACTOR,
+                              G_PARAM_READWRITE);
+  g_object_class_install_property (gobject_class, PROP_PRIMARY_ICON, pspec);
+
+  pspec = g_param_spec_object ("secondary-icon",
+                              "Secondary Icon",
+                              "Secondary Icon actor",
+                              CLUTTER_TYPE_ACTOR,
+                              G_PARAM_READWRITE);
+  g_object_class_install_property (gobject_class, PROP_SECONDARY_ICON, pspec);
+
   pspec = g_param_spec_string ("hint-text",
                                "Hint Text",
                                "Text to display when the entry is not focused "
@@ -1193,6 +1225,23 @@ st_entry_set_primary_icon (StEntry      *entry,
   _st_entry_set_icon (entry, &priv->primary_icon, icon);
 }
 
+/**
+ * st_entry_get_primary_icon:
+ * @entry: a #StEntry
+ *
+ * Returns: (transfer none): a #ClutterActor
+ */
+ClutterActor *
+st_entry_get_primary_icon (StEntry *entry)
+{
+  StEntryPrivate *priv;
+
+  g_return_val_if_fail (ST_IS_ENTRY (entry), NULL);
+
+  priv = ST_ENTRY_PRIV (entry);
+  return priv->primary_icon;
+}
+
 /**
  * st_entry_set_secondary_icon:
  * @entry: a #StEntry
@@ -1213,6 +1262,23 @@ st_entry_set_secondary_icon (StEntry      *entry,
   _st_entry_set_icon (entry, &priv->secondary_icon, icon);
 }
 
+/**
+ * st_entry_get_secondary_icon:
+ * @entry: a #StEntry
+ *
+ * Returns: (transfer none): a #ClutterActor
+ */
+ClutterActor *
+st_entry_get_secondary_icon (StEntry *entry)
+{
+  StEntryPrivate *priv;
+
+  g_return_val_if_fail (ST_IS_ENTRY (entry), NULL);
+
+  priv = ST_ENTRY_PRIV (entry);
+  return priv->secondary_icon;
+}
+
 /******************************************************************************/
 /*************************** ACCESSIBILITY SUPPORT ****************************/
 /******************************************************************************/

diff --git a/src/st/st-entry.h b/src/st/st-entry.h
index 071403b8fc211a2d788ae82e31f0ae84b047ec39..1fbc5561c3c1f885b0c71cbd147e5c0822720f5d 100644 (file)
--- a/src/st/st-entry.h
+++ b/src/st/st-entry.h
@@ -57,10 +57,13 @@ void            st_entry_set_input_hints    (StEntry        *entry,
                                              GtkInputHints   hints);
 GtkInputHints   st_entry_get_input_hints    (StEntry        *entry);
 
-void            st_entry_set_primary_icon   (StEntry        *entry,
-                                             ClutterActor   *icon);
-void            st_entry_set_secondary_icon (StEntry        *entry,
-                                             ClutterActor   *icon);
+void            st_entry_set_primary_icon  (StEntry      *entry,
+                                            ClutterActor *icon);
+ClutterActor *  st_entry_get_primary_icon  (StEntry      *entry);
+
+void            st_entry_set_secondary_icon (StEntry      *entry,
+                                             ClutterActor *icon);
+ClutterActor *  st_entry_get_secondary_icon (StEntry      *entry);
 
 typedef void (*StEntryCursorFunc) (StEntry *entry, gboolean use_ibeam, gpointer data);
 void            st_entry_set_cursor_func    (StEntryCursorFunc func,